From eef31532650e64f542d53508cb5137312bc4af39 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Sat, 5 Mar 2016 02:01:16 +0100 Subject: [PATCH] Adwaita: shrink scroolbars erroneusly pushed 15px scrollbars with the previous commit, back to 13px now. --- gtk/theme/Adwaita/_common.scss | 8 ++++---- gtk/theme/Adwaita/gtk-contained-dark.css | 18 +++++++++++------- gtk/theme/Adwaita/gtk-contained.css | 18 +++++++++++------- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 551e6f2b56..db842a8d33 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2044,8 +2044,8 @@ scrollbar { // slider slider { - min-width: 8px; - min-height: 8px; + min-width: 6px; + min-height: 6px; margin: -1px; border: 4px solid transparent; border-radius: 8px; @@ -2127,8 +2127,8 @@ scrollbar { // button styling button { padding: 0; - min-width: 14px; - min-height: 14px; + min-width: 12px; + min-height: 12px; border-style: none; border-radius: 0; transition-property: min-height, min-width, color; diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index ab033bdd42..2323131fd5 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -2178,11 +2178,15 @@ notebook > stack:not(:only-child) { * Scrollbars * **************/ scrollbar { + /* + // disable steppers + @at-root * { + -GtkScrollbar-has-backward-stepper: false; + -GtkScrollbar-has-forward-stepper: false; + } + */ background-color: #313434; transition: 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } - * { - -GtkScrollbar-has-backward-stepper: false; - -GtkScrollbar-has-forward-stepper: false; } scrollbar.top { border-bottom: 1px solid #1c1f1f; } scrollbar.bottom { @@ -2195,8 +2199,8 @@ scrollbar { background-color: #323737; border-color: #1f2222; } scrollbar slider { - min-width: 8px; - min-height: 8px; + min-width: 6px; + min-height: 6px; margin: -1px; border: 4px solid transparent; border-radius: 8px; @@ -2252,8 +2256,8 @@ scrollbar { min-height: 40px; } scrollbar button { padding: 0; - min-width: 14px; - min-height: 14px; + min-width: 12px; + min-height: 12px; border-style: none; border-radius: 0; transition-property: min-height, min-width, color; diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index aa42248dcf..b3284a079c 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -2188,11 +2188,15 @@ notebook > stack:not(:only-child) { * Scrollbars * **************/ scrollbar { + /* + // disable steppers + @at-root * { + -GtkScrollbar-has-backward-stepper: false; + -GtkScrollbar-has-forward-stepper: false; + } + */ background-color: #c3c4c4; transition: 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } - * { - -GtkScrollbar-has-backward-stepper: false; - -GtkScrollbar-has-forward-stepper: false; } scrollbar.top { border-bottom: 1px solid #9d9d99; } scrollbar.bottom { @@ -2205,8 +2209,8 @@ scrollbar { background-color: #e1e1df; border-color: #a5a5a1; } scrollbar slider { - min-width: 8px; - min-height: 8px; + min-width: 6px; + min-height: 6px; margin: -1px; border: 4px solid transparent; border-radius: 8px; @@ -2262,8 +2266,8 @@ scrollbar { min-height: 40px; } scrollbar button { padding: 0; - min-width: 14px; - min-height: 14px; + min-width: 12px; + min-height: 12px; border-style: none; border-radius: 0; transition-property: min-height, min-width, color; -- 2.30.2